From: Kenichi Handa <handa@gnu.org>
Date: Wed, 10 Oct 2012 14:47:31 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~692^2~8
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=90e847e221850d9300f3ffb77d953f3a4d28bb0a;p=emacs.git

merge trunk
---

90e847e221850d9300f3ffb77d953f3a4d28bb0a